merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 20 Feb 2007 22:43:57 +0000 (15:43 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 20 Feb 2007 22:43:57 +0000 (15:43 -0700)

Trivial merge